arm/p2m: Fix regression during domain shutdown with active mem_access
authorTamas K Lengyel <tamas.lengyel@zentific.com>
Wed, 25 Jan 2017 16:12:01 +0000 (09:12 -0700)
committerStefano Stabellini <sstabellini@kernel.org>
Fri, 27 Jan 2017 01:41:41 +0000 (17:41 -0800)
commitce7d99d69fb669110d346bda371306095f82d1e6
tree3e1001a733cea4c360e467db1af39af3175d97ad
parent9b3a59c10d91a57975661686dbc08278b78ae1de
arm/p2m: Fix regression during domain shutdown with active mem_access

The change in commit 438c5fe4f0c introduced a regression for domains where
mem_acces is or was active. When relinquish_p2m_mapping attempts to clear
a page where the order is not 0 the following ASSERT is triggered:

    ASSERT(!p2m->mem_access_enabled || page_order == 0);

This regression was unfortunately not caught during testing in preparation
for the 4.8 release.

In this patch we adjust the ASSERT to not trip when the domain
is being shutdown.

Ideally this fix would be part of Xen 4.8.1.

Signed-off-by: Tamas K Lengyel <tamas.lengyel@zentific.com>
Acked-by: Julien Grall <julien.grall@arm.com>
xen/arch/arm/p2m.c